Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cni spec version to 0.3.1 to support multiple ips #82844

Closed
wants to merge 2 commits into from
Closed

Update cni spec version to 0.3.1 to support multiple ips #82844

wants to merge 2 commits into from

Conversation

johscheuer
Copy link
Contributor

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug

/kind cleanup

/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

This PR changes the default CNI spec for kubenet to 0.3.1 and allow multiple IPs as return result which is important for the DualStack Feature.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

kubenet uses now per default the CNI spec 0.3.1 and support multiple IPs (DualStack Feature)

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubelet sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 18, 2019
@johscheuer
Copy link
Contributor Author

/test pull-kubernetes-verify
/test pull-kubernetes-e2e-gce

@aojea
Copy link
Member

aojea commented Sep 20, 2019

/cc @khenidak
/cc

@johscheuer johscheuer force-pushed the kubenet-update-cni-spec branch 2 times, most recently from 7c09c9d to 56fe509 Compare September 20, 2019 05:22
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. area/apiserver area/cloudprovider area/dependency Issues or PRs related to dependency changes area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/kubeadm area/kubectl area/test kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 20, 2019
AlexeyPerevalov
AlexeyPerevalov suggested changes Mar 24, 2020
View reviewed changes
Copy link
Contributor

@AlexeyPerevalov AlexeyPerevalov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to see amended commits (git commit -amend)

pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go Outdated Show resolved Hide resolved
@johscheuer
Copy link
Contributor Author

@AlexeyPerevalov if you want I can squash some of the commits (and change the commit message)

@AlexeyPerevalov
Copy link
Contributor

@AlexeyPerevalov if you want I can squash some of the commits (and change the commit message)

yes, it would be great

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 26, 2020
@johscheuer
Copy link
Contributor Author

@cmluciano I added some unit tests for the specific part

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Mar 26, 2020 •
edited

@johscheuer: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-kubernetes-local-e2e 56fe5092f41d0c527ed286e1a6da4867c9b26479 link /test pull-kubernetes-local-e2e
pull-kubernetes-cross 56fe5092f41d0c527ed286e1a6da4867c9b26479 link /test pull-kubernetes-cross
pull-kubernetes-conformance-image-test 56fe5092f41d0c527ed286e1a6da4867c9b26479 link /test pull-kubernetes-conformance-image-test
pull-kubernetes-e2e-gce-csi-serial 56fe5092f41d0c527ed286e1a6da4867c9b26479 link /test pull-kubernetes-e2e-gce-csi-serial
pull-kubernetes-conformance-kind-ipv6 56fe5092f41d0c527ed286e1a6da4867c9b26479 link /test pull-kubernetes-conformance-kind-ipv6
pull-kubernetes-e2e-gce-storage-slow 56fe5092f41d0c527ed286e1a6da4867c9b26479 link /test pull-kubernetes-e2e-gce-storage-slow
pull-kubernetes-e2e-gce-alpha-features 56fe5092f41d0c527ed286e1a6da4867c9b26479 link /test pull-kubernetes-e2e-gce-alpha-features

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@johscheuer
Copy link
Contributor Author

/test pull-kubernetes-e2e-kind

AlexeyPerevalov
AlexeyPerevalov approved these changes Mar 27, 2020
View reviewed changes
Copy link
Contributor

@AlexeyPerevalov AlexeyPerevalov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, Johannes now it's lgtm

@johscheuer
Copy link
Contributor Author

@dcbw any news on this one?

@khenidak
Copy link
Contributor

@johscheuer i see some tests are failing.. can i ask you to ensure that they are cleared?

@johscheuer
Copy link
Contributor Author

/test pull-kubernetes-files-remake

@johscheuer
Copy link
Contributor Author

@khenidak which tests are failing for you?

When I run the tests locally everything works:

=== RUN   TestGetPodNetworkStatus
--- PASS: TestGetPodNetworkStatus (0.00s)
=== RUN   TestTeardownCallsShaper
    TestTeardownCallsShaper: kubenet_linux_test.go:198: PASS:   DelNetwork(mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument)
--- PASS: TestTeardownCallsShaper (0.00s)
=== RUN   TestInit_MTU
--- PASS: TestInit_MTU (0.00s)
=== RUN   TestTearDownWithoutRuntime
    TestTearDownWithoutRuntime: kubenet_linux_test.go:318: PASS:        DelNetwork(mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument)
    TestTearDownWithoutRuntime: kubenet_linux_test.go:318: PASS:        DelNetwork(mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument)
    TestTearDownWithoutRuntime: kubenet_linux_test.go:318: PASS:        DelNetwork(mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument)
    TestTearDownWithoutRuntime: kubenet_linux_test.go:318: PASS:        DelNetwork(mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument,mock.AnythingOfTypeArgument)
--- PASS: TestTearDownWithoutRuntime (0.05s)
=== RUN   TestGetRoutesConfig
--- PASS: TestGetRoutesConfig (0.00s)
=== RUN   TestGetRangesConfig
--- PASS: TestGetRangesConfig (0.00s)
=== RUN   TestTrackPodIPs
--- PASS: TestTrackPodIPs (0.00s)
PASS
ok      k8s.io/kubernetes/pkg/kubelet/dockershim/network/kubenet        0.081s

@johscheuer
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-ubuntu-containerd

@cmluciano
Copy link

ping @dcbw for review

@johscheuer
Copy link
Contributor Author

If there is anything I can help with just ping me. One good thing about the "new" CNI version is that we can refactor some parts of kubenet to use the common CNI plugins with chaining (like stated in some comments).

@fejta-bot
Copy link

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.

If this issue is safe to close now please do so with /close.

Send feedback to sig-testing, kubernetes/test-infra and/or fejta.
/lifecycle stale

@k8s-ci-robot k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Oct 18, 2020
khenidak
khenidak reviewed Oct 26, 2020
View reviewed changes
pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go
}
}

return podGateways, podCIDRs
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That will blank out PodIPs. Is this what we want?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The plugin.addPodIP is called directly in the for loop instead afterwards so the behaviour should be the same?

@aojea
Copy link
Member

aojea commented Nov 17, 2020

does it makes sense to continue with this?
seems dockershim is moving out next release #94624

@fejta-bot
Copy link

Stale issues rot after 30d of inactivity.
Mark the issue as fresh with /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.

If this issue is safe to close now please do so with /close.

Send feedback to sig-testing, kubernetes/test-infra and/or fejta.
/lifecycle rotten

@k8s-ci-robot k8s-ci-robot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Dec 17, 2020
@aojea
Copy link
Member

aojea commented Dec 23, 2020

does it makes sense to continue with this?
seems dockershim is moving out next release #94624

@johscheuer should we close this?

@johscheuer
Copy link
Contributor Author

/close

@k8s-ci-robot
Copy link
Contributor

@johscheuer: Closed this PR.

In response to this:

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cmluciano cmluciano cmluciano left review comments

@aojea aojea aojea left review comments

@khenidak khenidak khenidak left review comments

@dcbw dcbw dcbw left review comments

@AlexeyPerevalov AlexeyPerevalov AlexeyPerevalov approved these changes

@dnardo dnardo Awaiting requested review from dnardo

Assignees

@dcbw dcbw

Labels
area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@johscheuer @aojea @k8s-ci-robot @cmluciano @fejta-bot @danwinship @dcbw @AlexeyPerevalov @khenidak